Merge from trunk
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Aug 2010 05:42:48 +0000 (07:42 +0200)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Aug 2010 05:42:48 +0000 (07:42 +0200)
commit031fb8fec779fc4eb2a504f5ce87330157d8dbfd
treec78cb38aa9bb3897e074919be98df36052e70295
parent7d22fb4c967b525023c2574afa47cc863d528451
parentdc97a7ddd99bbad7fc1d99d1192dc2b70d6ac2dd
Merge from trunk
14 files changed:
lisp/ChangeLog.trunk
lisp/help-fns.el
src/ChangeLog.trunk
src/alloc.c
src/buffer.c
src/data.c
src/doc.c
src/eval.c
src/fns.c
src/image.c
src/keyboard.c
src/lisp.h
src/lread.c
src/print.c